Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[13364] Fix memory problem when ciphering payload (backport #2485) #4153

Merged
merged 2 commits into from
Dec 22, 2023
Merged

[13364] Fix memory problem when ciphering payload (backport #2485) #4153

merged 2 commits into from
Dec 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2023

This is an automatic backport of pull request #2485 done by Mergify.
Cherry-pick of 25dee05 has failed:

On branch mergify/bp/2.6.x/pr-2485
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 25dee0530.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/messages/RTPSMessageGroup.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   test/blackbox/common/BlackboxTests.hpp
	modified:   test/blackbox/common/BlackboxTestsSecurity.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	new file:   test/blackbox/common/DDSBlackboxTestsSecurity.cpp
	modified:   test/blackbox/common/TCPReqRepHelloWorldRequester.cpp
	modified:   test/blackbox/common/TCPReqRepHelloWorldRequester.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/TCPReqRepHelloWorldReplier.cpp
	both modified:   test/blackbox/common/TCPReqRepHelloWorldReplier.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 16, 2023
@mergify mergify bot mentioned this pull request Dec 16, 2023
Merged
@EduPonz EduPonz added this to the v2.6.7 milestone Dec 18, 2023
@MiguelCompany MiguelCompany changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4099 December 18, 2023 11:29
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Dec 18, 2023
@MiguelCompany
Copy link
Member

Note: conflicts resolved, but this PR now depends on #4130

@MiguelCompany MiguelCompany mentioned this pull request Dec 18, 2023
Closed
JLBuenoLopez and others added 2 commits December 21, 2023 10:18
@JLBuenoLopez @MiguelCompany
Fix memory problem when ciphering payload (#2485)
40eb65d 
* Refs 13364. Regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13364. fix build when TLS_FOUND

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs 13364. Test with different lengths.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13364. Apply review suggestions.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 13364. Fix #2379.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Include what you use in DDSBlackboxTestsSecurity.cpp

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #13364. Fix warning.
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Fix build with TLS, but not security (#4156)
47b7c2a 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany changed the base branch from mergify/bp/2.6.x/pr-4099 to 2.6.x December 21, 2023 09:19
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Dec 21, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany reopened this Dec 21, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit ffe3b0c into 2.6.x Dec 22, 2023
11 of 14 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-2485 branch December 22, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.6.7
Development

Successfully merging this pull request may close these issues.
3 participants
@MiguelCompany @EduPonz @JLBuenoLopez